Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 24 Jul 2010 12:18:05 +0000 (12:18 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 24 Jul 2010 12:18:05 +0000 (12:18 +0000)
commitd7f719d9896271f919c38b8a362b6f1678553616
treeff6a1150653847fc0829010e8e85e7f27349385b
parent2f39e74368a2137db8cd484d24543f1f9eeb8719
parent95b47d8b99a948108eee0c8412cd12933fba1542
Merge from mainline.